Fix windows tests

diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index 8cd128201356c69f06cdcefcc370691edb658f14..9355f431a813d65397073b0745cce998158d55f0 100644 (file)
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -3,7 +3,7 @@ use std::collections::HashSet;
 
 use core::{Package, PackageId, PackageSet, Target, Resolve};
 use util;
-use util::{CargoResult, ProcessBuilder, CargoError, ChainError, human, caused_human};
+use util::{CargoResult, ProcessBuilder, CargoError, human, caused_human};
 use util::{Config, Freshness, internal, ChainError};
 
 use self::job::Job;

diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs
index ff9bdfe9d188101a13e81124b12fecdc7823cf2b..5269706a87406c493c5241de9da4129a46c0e65b 100644 (file)
--- a/tests/test_cargo_test.rs
+++ b/tests/test_cargo_test.rs
@@ -1,3 +1,4 @@
+use std::path;
 use std::str;
 
 use support::{project, execs, basic_bin_manifest, basic_lib_manifest};
@@ -73,11 +74,12 @@ test!(cargo_test_failing_test {
                                     ---- test_hello stdout ----\n<tab>\
                                     task 'test_hello' failed at 'assertion failed: \
                                     `(left == right) && (right == left)` (left: \
-                                    `hello`, right: `nope`)', src/foo.rs:12\n<tab>\n<tab>\n\n\
+                                    `hello`, right: `nope`)', src{sep}foo.rs:12\n<tab>\n<tab>\n\n\
                                     failures:\n    test_hello\n\n\
                                     test result: FAILED. 0 passed; 1 failed; \
                                     0 ignored; 0 measured\n\n",
-                                    COMPILING, p.root().display())));
+                                    COMPILING, p.root().display(),
+                                    sep = path::SEP)));
 
     assert_that(&p.bin("test/foo"), existing_file());
 })